Revision: bazaar--devel--1.2--patch-42
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu Feb  3 16:04:41 EST 2005
Standard-date: 2005-02-03 05:04:41 GMT
Modified-files: libarch/conflict-handling.c
    libarch/conflict-handling.h tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-13
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-14
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-15
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-16
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-42
    thelove@canonical.com/bazaar--devo--1.2--patch-10
    thelove@canonical.com/bazaar--devo--1.2--patch-11
    thelove@canonical.com/bazaar--devo--1.2--patch-12
Summary: merge from thelove@canonical.com/bazaar--devo--1.2
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-13
   Two related fixes for bug #6081: commit during conflicted state and baz status lying

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-14
   Now it really works, and the test cases prove it

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-15
   A LOT more test cases for resolved

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-16
   Double free problem, and upping the coding standard

 * thelove@canonical.com/bazaar--devo--1.2--patch-10
   Fixes for resolved

 * thelove@canonical.com/bazaar--devo--1.2--patch-11
   Resolved still wasn't quite right. Added a lot of test cases and it definitely works (note: anything is always equal to anything|0)

 * thelove@canonical.com/bazaar--devo--1.2--patch-12
   resolved again (rel_add_record doesn't copy records for you, leading to an eventual doublefree problem)

